Fixed some 3.x problems.