Patching more unusual bugs