Small fixes for device and UI.