Some fixup to use the Xbee shield as well