Fixes tests and appveyor issue with x64 version not compiling.