[XWIKI-3544] Fix few remarks from #304

As commented in #304