Update to 0.34.6, changes proposed by kwm