Fix errors swift beta 7

Fix errors in Swift caused by changes in the Beta 7 release
Merge branch 'fix-errors-swift-beta7'