Updates to build / config