Local-Client: Minor improvements + Network bugfix