Some bug fixes : 5632 and 5651

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