Minor and cosmetic fixes.