some fixes from previous commit...