Corrections based on feedback from @edds