Tweaks and enhancements to Backstab library