Fixes around the confluent shutdown facility