fixes for bugs reported by foresters in June