Further egg fixes
Merge pull request #26 from Metaswitch/egg_fixes

[Reviewer: Andy] Further egg fixes