Fixes for Drop3 API changes