more small fixes