Datepicker: CGL fixes