grextras: fixes from the last commits and work