Making plugins work better for 3.0