Fix const warnings