Fix const errors