Fix type conflicts