Tweaking build scripts