More const correctness corrections