More disarm fixes