fixes Xcode 6 compile errors
test
Fix more warnings