CLEREZZA-845: Fixed issues as suggested by Luigi

git-svn-id: https://svn.apache.org/repos/asf/clerezza/trunk@1543569 13f79535-47bb-0310-9956-ffa450edef68