Updated device-specific stuff