Mutation fixes mostly