Some small changes

Will squash later...