Fix: Drop indicator and other small fixes