Some more cleanup fixes