fix some setup