Fix problems found by Gerd & only attempt to FAIL non-final state jobs.