A few fixes. (v3.7.1)