US5996 Code review fixes