small fixes to previous change