Some bug fixes
Merge branch 'master' of https://github.com/samowre/PVS
bug fixes