[CAST-1987] Fixes.