Mutation fixes

As requested.