Some more small cleanups