More stuff added for bug #7337.