Update Device overrides and move some things