further tweaks - make compatible with x86 again.