More cleanup/fixes.