small fixes to previous commit