Various fixes for tickets #93, #94, #95, #95, #96.

git-svn-id: http://svn.zoo-project.org/svn/trunk@467 4b6b6ad6-68b3-4dcc-9231-bd9b83bc5dc3