Fixes for journal cell logic