More build optimizations