Final fix of Eggshell & related.