missing bits from my local tree, fixes compile issues.