Fixed some compile problems
Merge branch 'master' of https://github.com/slimjim777/pyland