Fixed last warnings