Fixes for duplicate entry.