case 3274 - Fixes for CR.