[cbdt] More sanitize work
2 files changed