various fixes
dumps