More fixes for Make Me a World.