Tweak copy-dir and update spark-env