fixes for latest Xcode 6.1 and swift language