Labeling tweak, other small stuff