Fix a couple of fatal errors

Change-Id: I94607f2e72ea8f0f9368ded1147857936985234a