A couple minor fixes to last commit