Fixup style, WIP proxy server