Fixed client stuff