[PATCH v6 0/2] Two x86 fixes