Fix all sorts of issues preventing local testing for people-who-aren't-me