Fix previous changes to plugin setup