Fix some deep down derps on Jewel

Change-Id: Icaf379952374fdc306a40c57e2a6434b8a946cd2