Some more warning removed