Merge HC/DAC changes, also some minor typos/fixes