Fix up device tree