Fix stdin commands (need to store client)