Xcode61fix

noticed a few things when trying to run under Xcode 6.1