followup configuration changes after previous refactoring to static libs