Fixing more of my mess