Add const modifier to appropriate functions