Fixes import and dump issues.