fixes for swift updates