Swift Fixes for Xcode6-B6