Fix beta 7 errors

Fix swift errors caused by changes in xcode 6 beta 7 release
Merge branch 'fix-errors-xcode6-beta7'