RA-74 Post review fixes