Misc. clean up after review