plugin fixups, all ready to go