Fix some places where 'done' wasn't getting called.