fix rc and CI