Performance fixes
Broken build