Latest round of updates for RC2