(*) CTL-233 Small improvements