Swift 1.1 fixes