Minor build optimizations