Fix broken tags

Change-Id: Ica3c600e5f1fee1a3257aaba7e7fe3db8a57a380