Fix of schema plugins