Minor fixes for CO-416