case-3406 - Minor changes