More device style fixes