Bunch of changes to try to get mod eggs to work