Bugfix for edit not working on solutions + bugfixes for problems noticed...

1) Fixes problem with editing for both Calendar & Documents, [SOL-124]

2) Fixes stuff reported by Xavier