Switch to long tags for compat