Fix device tree issues