Fixed things for earlier C standard