Fixed some setup issues