Some testing changes that should be rolled back (311) & fixed plugins (still not sure if we'll use them).