Minor changes throughout multiple files.