Fixes related with issues detected on x64 build;