More device tweaks