fixed minor issues in deviceToken