changes to satisfy gcc