More changes to make swift run