Fix Windows 7 build problems from old dependency versions