Fix type around errors