Fixes for Swift b5