cosmetics fixes