const correctness fixes