More cleanup/fixes