Fix for Device schema.