Fix some derps and bad headers

Change-Id: Ibc8c82cd693072e013371ea07d797d310e3b6773