various fixed around session