[v6r8]FIX: bugfixes

Fixes here and there.