Reinstate inner-label stuff