Fixes on plugins