Finalize pre-3.0.0 plugin fixes