Various changes I should have committed previously.