Fixes for Swift changes