fixes for bug #11210