Fixes in build scripts