Drones fixes.

See commit log.