Further drop improvements