Fix v6r8 bugfixes

Fixes here and there.