Various fixes to make the extension work with Grizzly Nova

Change-Id: Ia783c00e605c022b67320d5f979bd1d33553c93a