Fix build errors in current environment.
Merge branch 'master' of github.com:francalab/francalab-misc