some tweaks for device