Fixes to various files.