Fixing a couple of missed parts of #52