Changes so that parallel version will end successfully.