Fix up device configs