Fixing stuff for 3.0.0 release

Releasing June 18th!

[ci skip]