Further fixes for the SCL transition.