Fixes for swift