Build fixes for vs2015

Jørgen Lind requested to merge feature/jorgen.lind/build_fixes_2015_1_0_branch into 1.0 Aug 24, 2020