Fixes for Swift files