FIX: various fixes for v6r8

Correction of some bugs spotted by jenkins