Applied feedback from @behlendorf