Misc fix for 32-bits and Eiichi computer