more small fixes.