[3.7] Bug fixes for 3.7.6