more fixes from the previous commit...