Small patches and replies ...

... to be discussed !