Fixes in Setup scripts