Fixes for 'label' refactoring