drop completion fixes