Trying to fix my own screw-ups