A lot of small fixes that came out of debugging the galaxy runs.