Fix bug when wrapped in label and minor updates