swift 2.2 fixes.

[craiggrummitt]

Thanks for that John, as per each Swift release there's a bunch of other fixes to do, I'm working on that now.