some fixes (again)