Fix openocd and openwatcom