Fix a few CustomDrop issues.