Fixes #5: minor fixes to adapt the build script