Further mod's to satisfy gcc