diff --git a/mifosng-provider/src/main/java/org/mifosng/platform/api/ClientsApiResource.java b/mifosng-provider/src/main/java/org/mifosng/platform/api/ClientsApiResource.java
index 757a483c4..df41163e8 100644
--- a/mifosng-provider/src/main/java/org/mifosng/platform/api/ClientsApiResource.java
+++ b/mifosng-provider/src/main/java/org/mifosng/platform/api/ClientsApiResource.java
@@ -354,7 +354,7 @@ public class ClientsApiResource {
 				fileDetails.getFileName(),
 				ApplicationConstants.MAX_FILE_UPLOAD_SIZE_IN_MB);
 		
-		System.out.println( bodyPart.getMediaType().toString());
+		logger.debug(bodyPart.getMediaType().toString());
 
 		EntityIdentifier entityIdentifier = this.clientWritePlatformService
 				.saveOrUpdateClientImage(clientId, fileDetails.getFileName(),
diff --git a/mifosng-provider/src/main/java/org/mifosng/platform/loan/domain/Loan.java b/mifosng-provider/src/main/java/org/mifosng/platform/loan/domain/Loan.java
index 135b88f26..24fa249da 100644
--- a/mifosng-provider/src/main/java/org/mifosng/platform/loan/domain/Loan.java
+++ b/mifosng-provider/src/main/java/org/mifosng/platform/loan/domain/Loan.java
@@ -536,7 +536,7 @@ public class Loan extends AbstractAuditableCustom<AppUser, Long> {
 		boolean dateHasChanged = false;
 		
 		if (originalLocalDate != null) {
-			dateHasChanged = originalLocalDate.equals(providedLocalDate);
+			dateHasChanged = !originalLocalDate.equals(providedLocalDate);
 		} else {
 			dateHasChanged = (providedLocalDate != null);
 		}
@@ -602,8 +602,11 @@ public class Loan extends AbstractAuditableCustom<AppUser, Long> {
 					submittedOn, getExpectedDisbursedOnLocalDate());
 		}
 		
-		for (LoanCharge loanCharge : this.charges) {
-			validateChargeHasValidSpecifiedDateIfApplicable(loanCharge, getDisbursementDate(), getLastRepaymentPeriodDueDate());
+		// charges are optional
+		if (this.charges != null) {
+			for (LoanCharge loanCharge : this.charges) {
+				validateChargeHasValidSpecifiedDateIfApplicable(loanCharge, getDisbursementDate(), getLastRepaymentPeriodDueDate());
+			}
 		}
 	}
 
diff --git a/mifosng-provider/src/main/java/org/mifosng/platform/loan/service/LoanChargeAssembler.java b/mifosng-provider/src/main/java/org/mifosng/platform/loan/service/LoanChargeAssembler.java
index 7c7a2a3a7..f6feb43b5 100644
--- a/mifosng-provider/src/main/java/org/mifosng/platform/loan/service/LoanChargeAssembler.java
+++ b/mifosng-provider/src/main/java/org/mifosng/platform/loan/service/LoanChargeAssembler.java
@@ -68,11 +68,14 @@ public class LoanChargeAssembler {
 		
 		if (charges != null) {
 			loanCharges = assembleFrom(charges, loanPrincipal);
-		} else {
-			for (Charge productCharge : chargesInheritedFromProduct) {
-				loanCharges.add(LoanCharge.createNew(productCharge));
-			}
 		}
+		// TODO - kw - dont inherit charges from product by default, user may remove charges (that were default) during creation - expect 
+		//             charges to be passed along in request at time of creation
+//		else {
+//			for (Charge productCharge : chargesInheritedFromProduct) {
+//				loanCharges.add(LoanCharge.createNew(productCharge));
+//			}
+//		}
 		
 		return loanCharges;
 	}
diff --git a/mifosng-provider/src/main/java/org/mifosng/platform/user/domain/Permission.java b/mifosng-provider/src/main/java/org/mifosng/platform/user/domain/Permission.java
index 9ebcb96dd..1de82cb81 100644
--- a/mifosng-provider/src/main/java/org/mifosng/platform/user/domain/Permission.java
+++ b/mifosng-provider/src/main/java/org/mifosng/platform/user/domain/Permission.java
@@ -2,8 +2,6 @@ package org.mifosng.platform.user.domain;
 
 import javax.persistence.Column;
 import javax.persistence.Entity;
-import javax.persistence.EnumType;
-import javax.persistence.Enumerated;
 import javax.persistence.Table;
 
 import org.mifosng.platform.api.data.PermissionData;
@@ -13,10 +11,12 @@ import org.springframework.data.jpa.domain.AbstractPersistable;
 @Table(name = "m_permission")
 public class Permission extends AbstractPersistable<Long> {
 
-    @Column(name = "grouping", nullable = false, length=45)
+    @SuppressWarnings("unused")
+	@Column(name = "grouping", nullable = false, length=45)
     private final String          grouping;
     
-    @Column(name = "order_in_grouping", nullable = false)
+    @SuppressWarnings("unused")
+	@Column(name = "order_in_grouping", nullable = false)
     private final Integer          orderInGrouping;
     
     @Column(name = "code", nullable = false, length=100)