fixes for Xcode 5.1, clang 503.0.38 stricter with some warnings