Minor changes to some files