Final fix to plugin setup