Enable per package and fix perf