Add more optimizations to global build