Fixing more Swiftable