some more const correctness