Fix device override

Some devices were incorrect used. An extra override
was also added.