Changes from Cheri for code review