Some fixes to device tree