Small bug fixes on AD draining