[CAST-1984] Fixes.