A few more cleanup fixes