Fixing class not found issues.