Completed peer review fixes