SAL annotation fixes

Perf got worse, still broken