=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/organisationunit/OrganisationUnit.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/organisationunit/OrganisationUnit.java	2015-09-13 16:04:26 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/organisationunit/OrganisationUnit.java	2015-09-13 17:00:06 +0000
@@ -167,7 +167,7 @@
 
     public OrganisationUnit()
     {
-        setAutoFields(); // to have getPath working properly, we need to set auto fields (for uid etc)
+        setAutoFields(); // Must be set to get UID and have getPath work properly
     }
 
     public OrganisationUnit( String name )

=== modified file 'dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/sms/SmsPublisher.java'
--- dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/sms/SmsPublisher.java	2015-01-17 07:41:26 +0000
+++ dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/sms/SmsPublisher.java	2015-09-13 17:00:06 +0000
@@ -95,7 +95,7 @@
 
                 try
                 {
-                    Thread.sleep( 3000 );
+                    Thread.sleep( 10000 );
                 }
                 catch ( InterruptedException e )
                 {