A couple fixes
Merge branch 'master' of https://github.com/Tabras/orange_system