some other fixes (end of the previous commit)