fixed xcode 5.1 compiler warnings
copied over changes from 1.3.10 sdk to fix compiler warnings