Some bugs fixed on the RS.