minor builder improvements