More fixes for bug #12806.