Fix various problems with drop hint calculation. This should clear up most of the more obvious issues.