Compilation fixes

For x86