fix build scripts
merge commits