db/kernel.return_fixes: add some more functions