Minor fixes/cleanup on a few areas