Few minor changes to help with RI update