Fix plugins / semantics