Minor Changes

These were necessary to make the script running OK.