Merge "Fix dump vars."