Fix diaylzer warnings