device: some tweaks