More crash fixes

Change-Id: Ib12381cd1869cd6593d99a31fa8c0d3995022798