Fixes issues with tags and CI related