Fix and cosmetics