Fixed some of the setup issues.