CR fixes builder