Fixed setup issues.