Cosmetic maintenance fixes.