- fixes for x32 arch