General fixes requested from an additional peer review