Updates for Swift 1.1