Misc clean up