More fix ups for common device tree.