Changes due to Swift changes.