Minor fixes
Added plugins