Minor changes

Associated with downloading and testing on a new machine
Minor changes