Fix issues caused by lack of x86 LPI support