some fixes
Merge branch 'master' of https://github.com/INOVA-Technology/Conquest