Fixed device fragment bugs
Device id fixing
merge fix