Fix further minor problems (remarks of Denis)