Moar fixes

Change-Id: I49630b4f2fc6ce0025aec7a61040c5ec750a8eeb