Minor updates to generating sessions