Minor source updates