misc cosmetic fixes