Misc clean ups