Misc clean up.