Fixed several typos from porting 2.6.