Cosmetic changes to plugins