Merge branch 'fixes' into next

Merge our fixes branch to bring in a few things that new feature patches
rely on or conflict with.