Just a few corrections on some files

Minor corrections/changes on some files.