Some bug fixes : 5632, 5651 and 5657

Check out tracker.silverpeas.org for further details...