Merge "BT: Fix typo and improper data type"