Minor swift fixes that make it work in Xcode6