Updating pinny with fixes from the plugin factory