[DG,SR]{refactoring} R8 - minor fixes