Moved a few const functions to values