Misc 3.4 fixes 5