Multiple modifications to be pulled in to get them in sync

This pull request will hopefully get the two repositories in sync.