some basic fixes