Fix issues that break MSVC strict compilation#2727

oznogon wants to merge 2 commits intodaid:masterdaid/EmptyEpsilon:masterfrom

oznogon:fix-strict-compilationoznogon/EmptyEpsilon:fix-strict-compilationCopy head branch name to clipboard