More fixes & tweaks for downstream customization