Corrected first review findings from @swissmanu