Tweaking the build script a bit [ci skip]