Remove a const from where it should not be