Fixing the setup issues.