Minor fixes and tweaks
Fixes due to changes introduced by soft delete feature