More drone fixes.

See commit log again.