Fix drop related bugs