Try these const changes.