Minor source code improvements