minor const changes