Swift Fixes for Xcode6-B6

Fixes for the new changes in Swift Xcode6-B6