Fix more colargol stuff