More grizzly compatibility

Change-Id: I3fb3783bd9fcd3f30429a7d4969fc588a6279fc8