Modifications for docs warnings