minor fixes
Merge pull request #741 from bjacob/minorfixes

minor fixes