Fix type and requirement contents