Upgrade to 2.3.7 and fix compilation error