Fixes and changes

Various needed fixes spread across 2.3, 2.4, and 2.5.  Still need to
combine everything before any of this is useable.