minor fixes to prior commit