[PATCH v5 0/2] Two x86 fixes