RA-73 Post review fixes