Fix a couple of issues in fakeserv