OS/2 compilation compatibility fixups