Fix the client markers which were broken for a while