Some more small cleanups and misc changes