Fix the setup related things