few minor fixes I missed last commit