ERM++: An Improved Baseline for Domain Generalization