fix some setup issues