First cut at fixing classifier issues.