Various fixes spotted during productive use

Bindings are still for version 2.8.7! I will create bindings for 2.11.x soon.