merge trivial fixes from Abderrahim.