Fixes to tags and prefabs