More cleanup and couple fixes