Adding some more consts to make comparisons happy