Fixed issues caught by Xcode 5.1 b4.