[Drops][Orator] Fixes