a few fix for rc