Fixed client issues