minor fixes users and clients