Fix beforedrop and drop regression due to arch3 upgrade