A few minor improvements

These were found by reading through the previous merge commit.