More cleanup fixes