more tweaks for external builds