v3.10.7: fixing some bugs