some fixes to device tree