[BUG #8839] fix some glitches