Misc. clean up and tweaks