CELDL-77 - Minor changes