various journal fixes