fixes in setup scripts