Hotfixes for the CRI leadership