Small tweaks to the code base.