Fixed constness in a few places.