Tweaks to how soft deletable models are handled