Some final touches for bug #7814.