v1.87 minor fixes