fixes to build by Open Watcom toolchain