[fix] RC (little fixes)