[UNIATA] Get back a ros diff spotted by Thomas and use our debug checks in some more...