Fix Xcode 6b5 Swift compiler errors