Egg setup files fixes