Minor changes to the plugins