Some minor glitches which force us to be a bit more structured.