Various improvements ported back from Europe Commons integration.