dropto and dropf fixes