Fixes for grizzly