Fix conflicts with other devices