Fix for UI, and possible fix for drones