a few fixes to get this upgraded to 2.3.15