Fixes for DNA2, again,