Restart issues

Checked with rake, and with image emi-C1A74232 on our local cluster.