x86: fix issue #470 & #471 reported by Ruslan Kabatsayev
3 files changed