Some bug fixes : 5615 and 5649

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