Some minor fixes
Merge branch 'master' of https://github.com/teodortalov/citrix.git