Minor fixes after last cluster-compatibility update.