Changing things to make the new version of Swift happy :)