Severa minor fixes (see commits)

Sorry, I don't understand your comment.