Misc cruft - Drones are still wonky, this might fix em.