Fix some issue that work with x86_32.