Dataset agent fixes

DO NOT MERGE