Merge pull request #631 from leprechau/v3.0.x

misc fixes