Fixes for swift node