a bunch of fixed regarding plugins processing