Add new found warnings fixes