Uncontroversial wikimedia improvements

Here's the first tranche of changes. These should be relatively uncontroversial. There's quite a lot to review though!