Couple Swift 1.0 fixes.