Syncing up my device tree to Legacy's working fixes