GC: fix Sentinel + other fixes