Fixes related to tagging