Fix wrong reference
Fix dts files missing
Fix merge conflicts from master