Fixes for the new Swift 1.1 syntax