Fixes some of the dozer issues