More CSTL-989 fixes.