Fixed minor issues in the setup scripts