Bug fixes for the final data move shell script