Minor bugfixes from large task tests.