case 2185 - Fixes after CR.