Add some build optimizations