Improve git compatibility with tags