More fixes for bug #16099.