different small fixes, see bcbdb5d87dd