basic fixes.