Some cleanup fixes