[CAST-1983] Fixes.