Changed some indexes to not unique, avoiding bug in production database server