Client fix comments