Fixes in setup related scripts