Correctly include extras.