Minor changes on plugins