Additional fixes for CO-784