Fix and clean here and there