fixes for xcode 6.1 changes

there were changes from Xcode 6 to Xcode 6.1, swift changes.