Fix various custom tag issues