Improve consistent block labeling