Additional fixes for CO-620