Fixes for newer swift changes