Implemented minor changes for improving parallel performence