Fixing a few minor issues with #1088