Fixes to duplicate notice