Build speedup, more operations