gras: misc fixes from last commit