Small fixes found by scan-build
Merge branch 'master' of github.com:kAworu/tagutil