Improve mutations a little