Patch fixing several problems reported in the last few days.