Small cleanup
Misc tweaks