Fixed some issues after commit with rts_branch. also updated the roe code