fix some Sentinel issues