More egg fixes