more basic fixes