More fixes and request to bump the release number

The aim is to mark this as a new release. Possibly call it 3.7, since this isn't a release being made by Cisco themselves.