more small fixes in related