fixes from Clint