Final fixes to external client.