revert some of the const changes that make sense