Fixup after review by @pickypg