[CAST-1983] fixes.