Update to v3.1.8.6

Small fixes