some cleanup and a dozer bugfix