Client fixes and linked list fix