Fix const correctness