Fix keys for component lists