Slight fixes.

[branch: dev1.2.6]