Fixing 'gotchas' revealed through NAR work