Fixes to helix plugins.