Quick and dirty code fixes for Xcode 6 beta 3 Swift changes - basic stuff works but not fully tested