minor fixes to the previous commit