small fixes (again)