[DOLLE], [PIERRE] style fixes.