Fixup evolution dependancies