More changes to session and filereceiver.