Add a few minor fixes.