I just noticed some test failures on that PR that were my fault, and added a fixing commit to those