Fix up a few errors and clean up the dhdata extension