Minor source improvements.