Tweaks to various files.