Updates to build system