Fix and do RC2