Various minor fixes/cleanup