HTML-523 Post review fixes