Minor improvements

Hi Jan, 

Here is some minor improvements as suggested in my message on the mailing list.

Regards,
Nicolas