Fix a few more old-world files…