Some basic fixes.