Device Trust - additional improvements