[CAST-1774] Minor corrections.