some more small fixes