[XWIKI-3544] Fix few remarks