Some updates for RICG stuff.