More late tag fixes from the 12/13 workshop