various minor fixes

git-svn-id: http://upp-mirror.googlecode.com/svn/trunk@7942 05275033-79c2-2956-22f4-0a99e774df92