Address some issues with classification and regression