DE19709: fixed additional rendering issues found during testing