Fixing a few bugs in my `fix` according to review