Fixes issues introduced with Swift Beta 4