HV-809 Apply Corrections and Suggestions