Fixed data callbacks not passing the device properly