Fixes for papertrail duplication