Minor corrections for the next release

Someone land this?