Bugfixes to parallel entropy computation