Fixing helps warnings