Fix omit fields for device