Backport Kent Fixes