Various fixes and update to 3.4.34