More bug squashing

Trying to track down the hg-include bug now….