Fixed some setup problems