Bug fixes with UAVRole and UAVBattery