BRL: Some more changes to sync with production use