small improvements to 3.4