few cosmetic fixes