Label fixes and other small changes