Added tags and fixed failing build