Various tweaks across multiple files.