Fix even more fatals

Change-Id: I293d3c11603fad20464fabff14a3727f9db25eb1