Fixes to mass-tag