Fix option to be consistent
Fix local db session commits, update logging