Dumper Fixes (WIP)