case 3697 - Minor improvements.