2 more small fixes