Minor tweaks to trigger tests for openocd.