fixes for Xcode5 dp1 warnings

I consolidated this PR from the realestate-au one.