small fixes for drop