Fixes for the paper_trail changes