Accounting

Here's a couple of fixes for Marathon related to task accounting.

@guenter @florianleibert