fixes from region-fixer