Fixes for tag changes