Tweaks to build and config process after testing scripts manually