Some minor changes to make Edge almost-mutant compatible #37