Sockeye: Checker code improvements