minor fixes.
Merge branch 'temp1'