Crowbarring tweaks