Committed some fixes to unbreak local server and client interaction.