Some small improvements for CTL-143