Compile fixes and other
Compile fixes and other 2
Merge branch 'master' of https://github.com/xmarkers/markers-rp