Address nits from @pnkfelix