Fix regressions introduced in sentinel
228a5376f75044c7d98419f077e99486b2bb217a introduced regressions. This fixes them.