Small fixes for Ubuntu.
Merge branch 'master' of https://github.com/tacmon2/tacmon2sdk
Small fixes.