merging some fixes from the release branch; more to come later