Fix cosmetics