Internal fixes to client