Lots of egg-related fixes