Further Build Performance Optimizations