Cleaning in plugins and add some fixes