Corrected some minor 3.1.X problems.