Fixed setup scripts