Small label expansion fixes