Tweaks to several files