some more basic fixes