Tag-related fixes
Prepared for Travis CI