Small updates to plugin