Update

Compensate for changes in hcitool