Small changes to constness of some functions.