Mutations-fix

Cleans up a few issues that got lost in the move.