More changes to make database sessions work cleaner