Fixup map server

@v4hn