fix x86 build, minor refactoring