Fix mutation keys

Fixes #9706