Hopefully the last few fixes before 3.7.2.0