Xcode 6.1 Beta 2 fixes

Some changes in Swift caused it to no longer compile under Xcode 6.1 B2.