Some updates to build system