Some const correctness, finally