Several requested cosmetic fixes