Tweaks to EDD_Session. #675