Finally fix FakeInterfacePicker so it doesn't segfault, plus tidy up some nits