Code and whatsnew fixes.