Fixing Warp garbage; improving DataDriver's reliability.