Device tweaks by @chil360