Fixes

No fix yet for slow performance on HSL