Some minor fixes to parrying