EX-126(kmeng): More fixes, ready to merge to develop.