Fixup paths and timing for done callback