Fix minor things to reduce the Sentinel error count