Fix x86  build

Fixed Data conversion errors that prevented X86 build to succeed.