Minor improvements and fixes to ds2ds.