OGM-562

@DavideD That's a quick one for fixing the issue uncovered by @emmanuelbernard during the meeting. It also fixes some other related minor glitches as well.