Minor fixes. Most all of them are internal.