Woops, fix some 500s for non-WSplit runs