Bug fixes with dups