two more fixes related to previous commit