Small fixes + class layout for socket server as RMI client callbacks
only work over intranet.