Fix errors resulting from changes introduced in Swift 1.1