More sensible Europe PMC approach and various other fixes