Fixed some compile issues
Merge branch 'master' of https://github.com/dcs76/lang-jpvoc