PRD-4254 - Fixing bugs shown by tests