Fixing some bugs

See commit details for further information...

Do not omit to check out PR on Silverpeas-Components.