Some basic fixes