Some more warnings removal