v1.8.7:
Lots of fixes