Fix fatals

Change-Id: I39f2f4d66ad340b395ecf66e259fab2f8a59bda9
Merge "Fix fatals"