Miscellaneous const changes and utilities