Tweaked build scripts