Add more build optimizations