Resolve issues with SQLCluster

Change-Id: I7c60dfde52d328279f0cc9f3a822a40d66dd5126