New species and combinations in Helvella and Gyromitra